Merge branch 'gtk-3-0' into broadway

Conflicts:
	gdk/gdkdisplaymanager.c

diff --cc configure.ac
Simple merge

diff --cc gdk/Makefile.am
Simple merge

diff --cc gdk/gdkdisplaymanager.c
index 43dff5b68bd66eec2b0df20feca076f289a959ab,1c442045f9e04ba3eb06419ec1e41c2e723c221b..11b899ccba7e335c737ff5fa7e5409597211b76b
--- 1/gdk/gdkdisplaymanager.c
--- 2/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@@ -244,10 -235,10 +239,15 @@@ gdk_display_manager_get (void
          manager = g_object_new (gdk_win32_display_manager_get_type (), NULL);
        else
  #endif
+ #ifdef GDK_WINDOWING_X11
+       if (backend == NULL || strcmp (backend, "x11") == 0)
+         manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
+       else
++#endif
 +#ifdef GDK_WINDOWING_BROADWAY
 +      if (backend == NULL || strcmp (backend, "broadway") == 0)
 +        manager = g_object_new (gdk_broadway_display_manager_get_type (), NULL);
 +      else
  #endif
        if (backend != NULL)
          g_error ("Unsupported GDK backend: %s", backend);